Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 26 Nov 2011 19:07:30 +0000 (11:07 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 26 Nov 2011 19:07:30 +0000 (11:07 -0800)
commit3dbba59709e0e220edfc3135c27b1578f1b4efd9
tree28ba61ed9dcbe7215e96dd0d4ec346e7b15da3c2
parentd488517e67743f9e27119f78fcb6c8f68ab8f0c2
parent4198cf95666b2cd6849dd71d3c3ae93dd77ef932
Merge from trunk.